bitkeeper revision 1.1389.15.22 (42834743b1YPCf2OAXmLFLLg0agiUA)
authormaw48@labyrinth.cl.cam.ac.uk <maw48@labyrinth.cl.cam.ac.uk>
Thu, 12 May 2005 12:08:35 +0000 (12:08 +0000)
committermaw48@labyrinth.cl.cam.ac.uk <maw48@labyrinth.cl.cam.ac.uk>
Thu, 12 May 2005 12:08:35 +0000 (12:08 +0000)
Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/homes/maw48/xen-3.0-resources.bk


Trivial merge